From 75deff035bc8cd4df8f9f6a4507addb98ef134eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Tue, 13 Nov 2018 15:13:47 +0100 Subject: [PATCH] testappchooserbutton: Fix for class hierarchy change --- tests/testappchooserbutton.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c index 44476f5a7d..ea236024d9 100644 --- a/tests/testappchooserbutton.c +++ b/tests/testappchooserbutton.c @@ -23,16 +23,16 @@ #define CUSTOM_ITEM "custom-item" -static GtkWidget *toplevel, *combobox, *box; +static GtkWidget *toplevel, *button, *box; static GtkWidget *sel_image, *sel_name; static void -combo_changed_cb (GtkComboBox *cb, - gpointer user_data) +combo_changed_cb (GtkAppChooserButton *button, + gpointer user_data) { GAppInfo *app_info; - app_info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (cb)); + app_info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (button)); if (app_info == NULL) return; @@ -73,10 +73,10 @@ main (int argc, box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_add (GTK_CONTAINER (toplevel), box); - combobox = gtk_app_chooser_button_new ("image/jpeg"); - gtk_box_pack_start (GTK_BOX (box), combobox); + button = gtk_app_chooser_button_new ("image/jpeg"); + gtk_box_pack_start (GTK_BOX (box), button); - g_signal_connect (combobox, "changed", + g_signal_connect (button, "changed", G_CALLBACK (combo_changed_cb), NULL); w = gtk_label_new (NULL); @@ -91,37 +91,37 @@ main (int argc, sel_name = gtk_label_new (NULL); gtk_box_pack_start (GTK_BOX (w), sel_name); - gtk_app_chooser_button_set_heading (GTK_APP_CHOOSER_BUTTON (combobox), "Choose one, not two"); - gtk_app_chooser_button_append_separator (GTK_APP_CHOOSER_BUTTON (combobox)); - gtk_app_chooser_button_append_custom_item (GTK_APP_CHOOSER_BUTTON (combobox), + gtk_app_chooser_button_set_heading (GTK_APP_CHOOSER_BUTTON (button), "Choose one, not two"); + gtk_app_chooser_button_append_separator (GTK_APP_CHOOSER_BUTTON (button)); + gtk_app_chooser_button_append_custom_item (GTK_APP_CHOOSER_BUTTON (button), CUSTOM_ITEM, "Hey, I'm special!", g_themed_icon_new ("face-smile")); /* this one will trigger a warning, and will not be added */ - gtk_app_chooser_button_append_custom_item (GTK_APP_CHOOSER_BUTTON (combobox), + gtk_app_chooser_button_append_custom_item (GTK_APP_CHOOSER_BUTTON (button), CUSTOM_ITEM, "Hey, I'm fake!", g_themed_icon_new ("face-evil")); - gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (combobox), + gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (button), TRUE); - gtk_app_chooser_button_set_show_default_item (GTK_APP_CHOOSER_BUTTON (combobox), + gtk_app_chooser_button_set_show_default_item (GTK_APP_CHOOSER_BUTTON (button), TRUE); /* connect to the detailed signal */ - g_signal_connect (combobox, "custom-item-activated::" CUSTOM_ITEM, + g_signal_connect (button, "custom-item-activated::" CUSTOM_ITEM, G_CALLBACK (special_item_activated_cb), NULL); /* connect to the generic signal too */ - g_signal_connect (combobox, "custom-item-activated", + g_signal_connect (button, "custom-item-activated", G_CALLBACK (action_cb), NULL); /* test refresh on a combo */ - gtk_app_chooser_refresh (GTK_APP_CHOOSER (combobox)); + gtk_app_chooser_refresh (GTK_APP_CHOOSER (button)); #if 0 - gtk_app_chooser_button_set_active_custom_item (GTK_APP_CHOOSER_BUTTON (combobox), + gtk_app_chooser_button_set_active_custom_item (GTK_APP_CHOOSER_BUTTON (button), CUSTOM_ITEM); #endif gtk_widget_show (toplevel); -- 2.30.2